Follow-up I33462. Some stupid issues with gallery patch

Fix some embarrassing issues with my previous patch

Change-Id: I0a9a58ca854326ea594a9b8bd9499c89a0aca6c3

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 780feb9..e6836da 100644 (file)
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -176,7 +176,6 @@ production.
 * (bug 30713) New mw.hook "wikipage.content".
 * (bug 40430) jquery.placeholder gets a new parameter to set the attribute value
   to be used.
-<<<<<<< .merge_file_rX8GYk
 * $wgHTCPMulticastRouting renamed $wgHTCPRouting since it accepts unicast.
 * $wgHTCPRouting rules can now be passed an array of hosts/ports to send purge
   too. Can be used whenever several multicast group could be interested by a
@@ -188,10 +187,8 @@ production.
   setcookie() or setrawcookie() should begin using this instead.
 * New hook WebResponseSetCookie, called from WebResponse::setcookie().
 * New hook ResetSessionID, called when the session id is reset.
-=======
 * Add a mode parameter to <gallery> tag with potential options of "traditional",
   "nolines", "packed", "packed-overlay", or "packed-hover".
->>>>>>> .merge_file_gNstr1
 
 === Bug fixes in 1.22 ===
 * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index cf5a01e..fa9b2d3 100644 (file)
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -118,7 +118,7 @@ class NewFilesPager extends ReverseChronologicalPager {
        function getStartBody() {
                if ( !$this->gallery ) {
                        $this->gallery = ImageGalleryBase::factory();
-                       $this->gallery->setContext( $this->getContext );
+                       $this->gallery->setContext( $this->getContext() );
                }
 
                return '';